Copy the xm configuration file into the distribution. Comment-out the Xen-API

configuration therein, preserving the default behaviour.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 14f34135c8b0f9c2b348c038fad67dca3b4e8289..5ef741c55a22cbb0bb7d9eaa641cff99e009146a 100644 (file)
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -9,6 +9,7 @@ XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains
 # Xen configuration dir and configs to go there.
 XEN_CONFIG_DIR = /etc/xen
 XEN_CONFIGS = xend-config.sxp
+XEN_CONFIGS += xm-config.xml
 XEN_CONFIGS += xmexample1 
 XEN_CONFIGS += xmexample2
 XEN_CONFIGS += xmexample.hvm

diff --git a/tools/examples/xm-config.xml b/tools/examples/xm-config.xml
index dbd8778bae70d6cbb490187081ed6804db4fb04e..943b74d29732ac5f505feba41622467f3af70c6d 100644 (file)
--- a/tools/examples/xm-config.xml
+++ b/tools/examples/xm-config.xml
@@ -36,8 +36,10 @@ most useful for experimenting with the Xen-API preview in Xen 3.0.4.
        The username and password attributes will be used to log in if Xen-API
        is being used.
     -->
+  <!--
   <server type='Xen-API'
           uri='http://localhost:9363/'
           username='me'
           password='mypassword' />
+   -->
 </xm>